projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a450732 2047f78)
bitkeeper revision 1.1159.217.16 (41e78585MdlpNrs3tGvODh4pReIzpg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 14 Jan 2005 08:40:37 +0000 (08:40 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 14 Jan 2005 08:40:37 +0000 (08:40 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/include/public/xen.h patch | diff1 | diff2 | blob | history
xen/include/xen/irq.h patch | diff1 | diff2 | blob | history

diff --cc xen/include/public/xen.h
Simple merge
diff --cc xen/include/xen/irq.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.